* lisp/bookmark.el (bookmark-completing-read): Set the completion category

to `bookmark'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cdaf665baa37034a8f43c7ea406eb7e2a574f8d5..b1b7bc5962a52d32beafdfac9d09326c52adfac1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * bookmark.el (bookmark-completing-read): Set the completion category
+       to `bookmark' (bug#11131).
+
 2012-10-26  Bastien  <bzg@altern.org>
             Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 838e5a5ec007b20943c49770f88f4443505230c5..78ca6f22c8ed1fd305860eebcbf1470049ee5265 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -433,7 +433,11 @@ the empty string."
                                     ": ")))
           (str
            (completing-read prompt
-                            bookmark-alist
+                            (lambda (string pred action)
+                               (if (eq action 'metadata)
+                                   '(metadata (category . bookmark))
+                                 (complete-with-action
+                                  action bookmark-alist string pred)))
                             nil
                             0
                             nil